View improvments, bugfixes