Updating css files
Updating view files
Removing distinction between account and settings