Some more layout fixes, legend now lines up a bit better and neater...