clean up layout more