A lot of little changes to make things prettier ...
Same thing as before, MWSt Observer pattern for table not working... dunno why..