Applying some changes to frame structure