Fix layout and some view chagnes.