CLEAN UP LAYOUT