Moved Figures to right places