Fixed Bug and Added Card Layout for Settings