cleaner layout now