Refactor css & add images