Fixed layout inconsistencies