Issue#75 layout 

Fixed my messed up repository. Should resolve issue #75 now.