clean up layout and design