frontend ALMOST final touches, probably
Merge branch 'work'