Fixing some column sizes and some optimizations