fixing elections layout &c