More fragment fixes and more view changes