Fixed resources layout issues