Little bit of cleanup, move certain styling to css