New UI
Added extra database system