#29 Layout overflow problems was fixed.