Clean code and added Spirit controls tile (2/2)