minor adjustments
styling content activity
fix conflicts
Restore colors
git ignore file
fix con
fix con
git ignore