Added logs
Added db options
Merged base layout
Improved design