Improve home view