updates for #129. fixed layout and positioning.