Added new resources, fixed layout issues