Last commit before designing Main interface v4