UI layout cleanup