changes

rearrange the layout
fix a bug in the display
i did not make this, i merely rearrange the layout :)
author: Francisco Esquembre and Maria Jose Cano