Added some layout, started thinking about dealing with the total numbers