few minor layout fixes from post-presentation
fixed merged conflicts
Merge pull request #62 from obeid/release-1

Minor layout and nav menu fixes