Ui round2

Ready to go. Master merged into ui-round2.