added some css and refactered