Updated app to use overlay system