Remove unused resources
Update layout