Fixes
Simplified
JSHint + progress on UX