UI now handle rotation