Made get data more resilient
Tweaks to layout, setup