Final commit, bug fixes on achievements page