adding styles
fixing merge conflicts
adding backgrounds, some html