updated, added css object, refactored