Some minor code and layout cleanup