Issue#1 port code part2

This should close issue#2.

Please validate changes as much as you can before merging. You might want to merge via cmdline as you may want to update the css to make the logo and navbar look prettier.