Merge pull request #6 from gslender/master

Update Column and Navbar