Added several new layouts and classes for testing, added new ScanActivity