Numerous Changes to Layout