Added ui xml
Minor refactoring and updating README