Moving username/logout div
merging in styling changes