tweaks to layout and speed