Added limits section and fixed layout