Updated TODO
Fixed statusbar blinking