Some rework & UI improvements