rewirite home view - fixes