Button positioning, and some small fixes