Cleanup, add settings view
Fixes #4