Feature/objectnav refining

I know I bore you guys, but this is quite important update - Looking more like a real app every day.