Moved CSS around
More angulary way of handling type