started implementation offlow between pages
fixed merging conflits