layout fixes, tags fixes, navigation consistency clean up