Fixed some layout inconsistencies