Updated database Activity layout
Refactoring