Removed some activities from activityHistory

Stopped InviteeLounge and BluetoothLounge from being added to the
activity back stack. Also did some more stylistic code refactoring