some markup changes, as well as adding information in user screen