Improved UI, code structure + additional game options

Some more improvements