Orientation change fixes - draft not done

Signed-off-by: svenake <svenake@gmail.com>