Applied some styling to core handlers