Fixed formatting
Added module feature
Changed margin