working on bugs on work page