Omega/account layout fixes

4 commits with increasing "invasiveness". The last one is by far the biggest change. I think they can be cherry-picked if people don't want to go "all in".

I think the new stuff looks better, but I realize that not everyone might agree.

The fifth commit is another small fix, but it won't work well without the others (I'm too lazy to rebase it earlier in the order)