Restore back original UI, current is broken a bit and need some fixes