Tweaks and update home view, navigation