Layout improvements, optimizations
Meteor upgrade