ui changes
merged in the 'alex' branch and fixed conflict in admin