A couple minor bug fixes, TODO add bar for vertical and horizontal expansion