remove unused code blocks, fix navbar
Merge branch 'HIVE-117' of https://github.com/laziel/hive into HIVE-117