Ux improvements

Contains some ux improvements.