Made it more CSS Like