Fixed database issue
added main screen + menu