Made some tweaks in layout (sorry, clicked the format option) and some
bugfixes.