Interaction and CSS fixes