Changed how the stock is manged and how this information is displayed on the view
Merge changes