Adding some UI features