Added some missing UI elements