added username and css tweaks
merge conflict