Added websites stuff, cleaned