Improvements on layout
Fix angular http request
Fix angular http request