some fixes for draft layout