cleaned up initial layout