refactored some name for readability
adjust color
added the username segment