Changed thing functionality and fixed bug when screen is resized
Merged thing and location changes with Michael's new menu functionality