Make about activity scrollable
merge conflicts