update the look & feel to make it easier to understand
clean up a bit of code