Unwrap some imports
Include border around big avatar image