Added some UI stuff using templates