Tweak class placement in markup