Added bells and whistles to the UI