added functionality in UI aspects