Griffiths, Ellis take city seats