Last fixes before new design