Fixed layout issues with the individual frames