Re-adding logo, fixing navigation controller