fixed some widths and ng-shows
fixed widths & ng-shows
Merge branch 'julia' into testing