Added basic implementation of UI. Plus few minor changes