Front-End Navigation Update & Back-End Loader Bug Fix
Merge pull request #381 from christopherleckie/master

Front-End Navigation Update & Back-End Loader Bug Fix