Changes to layout, deleted unused resources