refactor + styles changes + cleaning + passport