started markup cleanup of layout