make layout cleaner