Added Layout, solved others issues.