Better labelling and layout tweaks