Lastest changes before merge
Responsive shit
Oldsmarty changes