Add username validation, update links