cleaned up code on Body layout