Remove unused files
Update layouts