Added Tag Controller, fixed Preview