First commit on new branch balances
Added test and modified CSS
Add if/else to top-nav
Fixed merge conflict
Nothing to commit