Modernizing some of the code
More improvements to cell layout