Fixing conflicts view and some minor bugs in configuration view