Refactor the design on mainform
ADDED NEW DATABASE SCHEMA