layout:improve layout; add username beside logout;