Main view improvmenets