Cleaning up layout for awesome