Few small tweaks to allow broader use by the client.

Also tried to de-fuckify the main layout, not liking it still.