Fixed Version for all layout issues

all layout issues should be fixed