Merge from branches

Continue working on ui