updated UI
merged with master