Cleanup and added new page for picking words