Properly fall back to application reserve, some small UI tweaks