Assets cleanup and Image Overhaul