Fix for event-firing order and a couple of css corrections