Bunch of improvements

Fixed regression which removed hide/show toggles