update home view + refactor