some rearranging and add sign in page as default index