Revert 5f5f175..27b9c22

This rolls back to commit 5f5f175b326a2810c00c83a24fc814afa79f318d.
Fixed Display of username at the top