Begin of moving gui to separate app
Fixed incorrect import