Minor clean up and added CTRL+S to save grid and avatars