Removing buttons for now, will need to merge all this with the YUI stuff in some clever way down the road...