grunt added, some layouting done