Updated layout. Added #29, and #2