cleanup layout and assets