Updated flatter UI