added issue 1.06
updated layouts and includes