more UI tweaking; think the layout is good now