Hopefully the final (for now) tweaks to the plan tab layout