Dev

Some small changes to port the app to Qt 5