ticket:3 Fix for screen rotation, editing layout