A much needed rework of spaces & sizing