Front nav update to before
Merge pull request #816 from sexnothing/develop

Front nav update to before