Tweaking
Added missing deps
Fixed
Tweaking
Added css
More work