Removed Done button in Period screen, refactored classes