Fix broken features and layouts