formatting
improved ui just a bit