Made everything use the same layout