Broke out classes and fixed styles