Updated config and includes and layouts