Layout changes, and added packages.
Database working

Probably a lot of spaghetti code now. Oh well :)