Fixed table creation
Some cosmetic changes
Worked a little on activities
Some cosmetic changes
Some cosmetic changes
Merge remote-tracking branch 'origin/master'