Few more layout tweaks, also tidy up the createBroker page