Final UI changes

All the UI changes done. Final backend integration remaining