refactored update logic
css Class refactor
more refactor