More layout alignment fixes and better labels