More styling and events cleanup