CSS tweaks & added click to emit