Move controlbar back into individual templates