UI fixes, added DB to cache the content