Implement basic UI and space add/remove support
14 files changed