fix border-radius and border
move the shared alignment options to the bottom
update grammar
remove completed TODO's
finish refactoring navbar-main to be like BS3