various fixes and removed menu in favour of toolbar icons