Cleanup, make fonts work, more work on gallery