Story board fixes