more changes for floating label component.  Still incomplete though.