some cleanup of layout