Cleaning up layout and design