Further bar and spacing changes