Fix alignment issues
Reduce fetch/render complexity