Fixed automargin for wrapper and added some beauty stuff