Bug fix to economy and added GUI elements