Mixins doing width calculations. Style cleanup and bugfixes