Fixing some overlapping layout problems