#6: Added simple bubble layout, fixed strings, optimisation