fix layout overlap issue #20
+12
−17
Merged
8000