some UI improvements added