polishing up first batch UI mods