Fixed ugly layout