Improved layout & minor fixes

Trio achievements are sent after finishing the game