Top bar sorted, controls added