cleaned up nav, fixed title resizing
Fixed conflicts