Some enhancements before I will improve working with frames
Some enhancements before I will improve working with frames