UI update
Merge branch 'master' of github.com:ninjaatif/idealab_client