Picture only entry handling (Closes #28)