More optimisations

Also shuffled inventory GUI out of player.