Major aesthetical fix