Clean up code and add margin under image