Final fixes and Add other scan page