Minor UI tweaks, refactoring, updated readme