CSS updates/formatting and  Event Controller bug fix