Added some new UI elements