Fixed layout inconsistencies; deleted extra code