MVP Fixes: make indicator pillow suck less