Re add Annotation testing
Change login & cancel buttons order