Few visual update changes
Merge branch 'master' of https://github.com/MisterStabbeh/CARE-DB
Merge conflict resolved
Reverting some files
Merge Conflict Resolved