Let's leave this for now if it works and fix it in a smaller subsequent PR that handles stuff like this and styling on the UI elements.