improved navigation bar (still not finished)
Merge branch 'new_engine' of https://github.com/davidgiga1993/SOLAR into new_engine