Cleaning up layout