Topbar tablet menu & other fix