added stuff and changed layout