More CSS work
Fix some callbacks. ;__;
Merge branch 'dev' into css