Added last changes to ui and pagination from Fryday
Merge remote-tracking branch 'origin'