Code cleanup
Layout changes
Add ActionBar to some activities