Many features added - mostly nice view