updated logic
updated grunt
updated styles and templates