Class scan package restriction
UI tweaks