Merge from resizeable branch

Getting ready to simplify and remove some features, especially to do with the UI.