Added functionality to procurement tabs and some drawing