Settings back to a preference activity, layout improvements