Added basic UI implementation 2