Made grid consistent and not all over the place