UI topicbranch 20141111

Pull Request for updating the UI