Added styling and updated classes to improve flexibility