Fix tabs, mv grid system to separate file