Started making changes to extract new frame layout