fixed styles and working on logic