fixed navicon js

and some layout issues