Next commit: implementing consistent design