- Cleaning up layout