Cleaned up gui, need to integrate pieces into it