Modify Layout and fix Missing Line Bug