ticket:73 clean up layouts