Changed Layout from tables to grid