Fixing layout of current members