alex clean up layout