Updated config and layout