Newui

merge newui changes into master