fix screens + links
merge