major refactor to simplify code and remove css service structure