Some small adjustments to sources layout