added more UI features