All updateClient changes merged into master

Massive UI overhaul in updateClient is being merged into the master