Improved layout, enabled truncation

Improved layout, enabled truncation, you should merge these into your code.