Feature/pretty

@nilstgmd please pull
---
@Age15990 @Desi252 FYI