Activated navbar and some minor changes