cleaning up layout