finished clean up of main layout