Features/rewind ui

Finishing up this branch for now. Merging...