Changed assets, layout, code cleanup