Playing around with zoom. Small changes to Core2Styles
Fixed merge errors