UAC improvements, small gui fixes