refactoring, events, appearance and tweaks