Positioning updates and general formatting/neatening