Content improvements V0.2.1