changed UI and added credit card view to this branch