Implementing Card UI and some UI improvements