more settings layout fixes