updated ui elements to merge applications together...
Merge remote-tracking branch 'origin/master'