layout fixes, among others