layout clean up. removed unused and invisble elements