Improve layout and labelling of admin settings