Various layout fixes/improvements, hashes reduced to 4 chars