Fixed layout bugs
Merge branch 'master' of https://github.com/renatorodrigues/StockPortfolio
Updated shares views to show stock data
Solved conflicts