music2: UI tweaks + code refactoring