layout viewplan fixes