updated layout based on wireframe

fixes #27 fixes #29 fixes #30