Added margins
Added list
Refactored code and added content