Refactor finesspanel