add basic styling for users index
Fix merge conflicts