Move classes to right package
Remove unused keys
Simplify layout by removing back button
Fix a NPE on ActionBar making it return correctly to main activity