Fixed some UI elements not working

Closes #1321