adding ui and fixes
removing unwanted
Merge branch 'master' of github.com:thennavanr/cab1