Bugfix in unlocking achievements + UI fixes