Several changes on grunt, and started to lay out main page