Adresses #361 - Reduced redundant code.
Adresses #361 - Reduced tile size to fit 3 columns on the test device.