layout upgrade, redict view and tests done