Moved Tutorial button position in menu, more code cleanup