Changed The styling and bug fixes