Added more visual stuff