major upgrades, add media 2, remove custom cke