fixed youtube embed and some refactoring