Fixed encoding bug, altered cv-layout