align right... should be done different...
more alignment
Code refactoring. Should have done long ago. :)