minor refactoring and SLAP-ping in UI