UI changes
final commit of 1.0.0