fixed view layout, added some new functionality,...