Style and layout cleanup