Add generics and remove code that causes warnings in eclipse
Renaming layouts and variables
Add button handlers for order activity