Seems to look quite nice now ;-) But still some work is to be done