Apply lastest changes

Added grunt tasks
Refactored logic
Layout aligned with latest designs and mobile version