Figure and Table labels

Add fix to figure label location