improve the layout and legivility a bit more