Combined Code

UI changes implemented and insert into database working