Misc Layout Updates
Changed db structure to use UID and got rid of history for now.