UI update 3 and fixes to make working again

This will be the final fix for version 1.1